From: Kenichi Handa <handa@m17n.org>
Date: Wed, 20 Oct 2010 00:46:21 +0000 (+0900)
Subject: merge emacs-23
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~16^2~30
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=13f23658a248e0dc9b97b579e6b756c857d15228;p=emacs.git

merge emacs-23
---

13f23658a248e0dc9b97b579e6b756c857d15228
diff --cc lisp/ChangeLog
index ccc593b7c61,fba84838c58..74f2acf740f
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,8 -1,33 +1,38 @@@
 +2010-10-20  Kenichi Handa  <handa@m17n.org>
 +
 +	* face-remap.el (text-scale-adjust): Call read-event with a proper
 +	prompt.
 +
+ 2010-10-19  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	* net/tramp.el (tramp-do-file-attributes-with-stat)
+ 	(tramp-do-directory-files-and-attributes-with-stat): Use "e0" in
+ 	order to make stat results a float.  Patch by Andreas Schwab
+ 	<schwab@linux-m68k.org>.
+ 
+ 2010-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* repeat.el (repeat): Use read-key (bug#6256).
+ 
+ 2010-10-18  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* emacs-lisp/unsafep.el: Don't mark functions that display
+ 	messages as safe.  Suggested by Johan Bockgård.
+ 
+ 2010-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+ 
+ 	* emacs-lisp/regexp-opt.el (regexp-opt-group, regexp-opt-charset):
+ 	Turn comments into docstrings.
+ 
+ 	* minibuffer.el (completion--replace): Move point where it belongs
+ 	when there's a common suffix (bug#7215).
+ 
+ 2010-10-15  Michael Albinus  <michael.albinus@gmx.de>
+ 
+ 	* net/tramp.el (tramp-open-connection-setup-interactive-shell):
+ 	Suppress expansion of tabs to spaces.  Reported by Dale Sedivec
+ 	<dale@codefu.org>.
+ 
  2010-10-15  Kenichi Handa  <handa@m17n.org>
  
  	* international/characters.el: Add category '|' (word breakable)